Merge: Fix minor problems found by static checking.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 14 Jul 2011 21:45:06 +0000 (14:45 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 14 Jul 2011 21:45:06 +0000 (14:45 -0700)

Trivial merge